finish killing GUI charset handling (#819)

* finish killing gui charset handling.

* more char set dead code cleaning

* even more dead code buried.

diff --git a/gui/advui.ui b/gui/advui.ui
index d1e031fc261349d548a2816991f0c9e47b936090..71494cc9a8b142caa5a40590b9609e190682f9ee 100644 (file)
--- a/gui/advui.ui
+++ b/gui/advui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>280</width>
-    <height>185</height>
+    <width>288</width>
+    <height>196</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,19 +24,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="enableCharSetXform">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="toolTip">
-      <string>Convert character set encoding between input and output</string>
-     </property>
-     <property name="text">
-      <string>Enable character set transformation</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="previewGmap">
      <property name="text">

diff --git a/gui/babeldata.h b/gui/babeldata.h
index 198f88893ed5a72858b76f7412d2be317b619911..9adb4dcd509b6f08c2295b9bbe1e0c7e30d6a89b 100644 (file)
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -50,7 +50,6 @@ public:
     outputCharSet_(QString()),
     synthShortNames_(false),
     forceGPSTypes_(false),
-    enableCharSetXform_(false),
     debugLevel_(-1),
     inputBrowse_(QString()),
     outputBrowse_(QString()),
@@ -106,7 +105,6 @@ public:
 
     sg.addVarSetting(new BoolSetting("app.synthShortNames", synthShortNames_));
     sg.addVarSetting(new BoolSetting("app.forceGPSTypes", forceGPSTypes_));
-    sg.addVarSetting(new BoolSetting("app.enableCharSetXform", enableCharSetXform_));
 
     sg.addVarSetting(new StringSetting("app.inputBrowse", inputBrowse_));
     sg.addVarSetting(new StringSetting("app.outputBrowse", outputBrowse_));
@@ -156,7 +154,6 @@ public:
 
   bool synthShortNames_;
   bool forceGPSTypes_;
-  bool enableCharSetXform_;
   int  debugLevel_;
 
   QString inputBrowse_, outputBrowse_;

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index c76fa7f9c71c21641bcb98c2738ccf3a01d34f1f..862629cfcc02436cba685325e194bb4dab14b3c9 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -877,22 +877,6 @@ int MainWindow::formatIndexFromName(bool isFile, const QString& nm)
   return 0;
 }
 
-//------------------------------------------------------------------------
-QString MainWindow::charSetFromCombo(QComboBox* combo)
-{
-  int i = combo->itemData((combo->currentIndex())).toInt();
-  return (i >=0) ? charSets_[i] : QString();
-}
-
-//------------------------------------------------------------------------
-void MainWindow::setComboToCharSet(QComboBox* combo, const QString& cset)
-{
-  for (int i=0; i<charSets_.size(); i++) {
-    if (charSets_[i] == cset) {
-      combo->setCurrentIndex(i+1); // first index is default;
-    }
-  }
-}
 //------------------------------------------------------------------------
 void MainWindow::applyActionX()
 {

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index d899ff02c499a6e4aa62e20ead90d8e4bd09c606..78ba6ee32bdf9bbd8b6b0125991c087eeb175ee8 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -61,7 +61,6 @@ private:
   QString        babelVersion_;
   bool          isBeta_;
   QPixmap        lights_[4];
-  QStringList    charSets_;
   AllFiltersData filterData_;
   BabelData      babelData_;
   bool           fmtChgInterlock_;
@@ -100,10 +99,6 @@ private:
   void loadOutputDeviceNameCombo(const QString& format);
   bool formatSupportsUSB(const QString& format);
   bool formatSupportsSerial(const QString& format);
-  void loadCharSetCombos();
-  void checkCharSetCombos();
-  QString charSetFromCombo(QComboBox*);
-  void setComboToCharSet(QComboBox*, const QString&);
   void updateFilterStatus();
   void setWidgetValues();
   void getWidgetValues();